diff --git a/installer/db845c/dragonboard-845c-bootloader-ufs-aosp/MD5SUMS.txt b/installer/db845c/dragonboard-845c-bootloader-ufs-aosp/MD5SUMS.txt
index f954248..61b9063 100644
--- a/installer/db845c/dragonboard-845c-bootloader-ufs-aosp/MD5SUMS.txt
+++ b/installer/db845c/dragonboard-845c-bootloader-ufs-aosp/MD5SUMS.txt
@@ -1,30 +1,30 @@
-531857a19d5e802db7ee35400ebdda39  abl.elf
+9e5bd5524c1379c511dd92ea33393ad7  abl.elf
 71c6dd41e387ddb12c8553091928ec39  aop.mbn
 b6d81b360a5672d80c27430f39153e2c  boot-erase.img
 40e97319f57ab9d0b60009163ff940c2  BTFM.bin
 cbd3f7ab1a261c30e9e3178c0ec09428  cmnlib64.mbn
 7e89535018695c938593581134d14871  cmnlib.mbn
-32d0a65bdd9dc7b503676a1bdc4346a5  devcfg.mbn
+699e4dc2a0dbac11b255c79422744b44  devcfg.mbn
 d5cf22da99f6a871d4c7d43ce8eb801a  dspso.bin
 4400827c0a6689bfe118a67d79b4fcd7  flashall
-6fdda3231e99ba8324bec09b9bb34238  gpt_backup0.bin
-30281439a182ec57bb116b6c0911ff6b  gpt_backup1.bin
-4348e67458ab0a5f3d857caac7d4fb13  gpt_backup2.bin
-94122e11939ad0dbf7ea353496b29d4f  gpt_backup3.bin
-c5b0b7ed073ab1885bf21da348ea9106  gpt_backup4.bin
-e1564c466be4b2fac4125f214be6dc96  gpt_backup5.bin
-6cad911b5774140c5838269297d7b67a  gpt_both0.bin
-b3157ad3ac65f24eed4ca03464f455f9  gpt_both1.bin
-8975544619a3771866407913fab2ccd7  gpt_both2.bin
-d601e030036e26a146420a003a50eb99  gpt_both3.bin
-191e9eb2fb6112a152d540523c9b722b  gpt_both4.bin
-d756bdf96eb604a35de2fc62e7e877e3  gpt_both5.bin
-761da7b8ca5e3b175ffc9d11b12e9bd6  gpt_main0.bin
-f6fbf11adfcd149901f7b385f372f24f  gpt_main1.bin
-ba6d04e1ff8b692bff1fd49789118ae7  gpt_main2.bin
-47bf786ee544b96e00bbab68ec3d4241  gpt_main3.bin
-6562d2c13ec71271edd4ba217c3c3870  gpt_main4.bin
-92452d54cc100a1bb0c1e50b5910745f  gpt_main5.bin
+61362db524d6b1a082aa3e68c5ce5226  gpt_backup0.bin
+10711bd7b6c795b396ec7acc6546641b  gpt_backup1.bin
+1384ab8fa504bed08282b9fdbedd1256  gpt_backup2.bin
+f9f43f922865a282bd340731e2e4c05c  gpt_backup3.bin
+c98f59260b9d839fd66c7a799344763b  gpt_backup4.bin
+f1dd799d40155b2fb0a13e74dc708ef0  gpt_backup5.bin
+62809acaa9deeafbcf228ab3dec80fba  gpt_both0.bin
+1a45d3cc41bf1f7ab52c35a8dafde7c2  gpt_both1.bin
+26156f1cf28c2b03a52dc645e0776a6a  gpt_both2.bin
+836794cd35e92ac1865bca5bceb3afa8  gpt_both3.bin
+2a728d731064cb62a253e05fda09584c  gpt_both4.bin
+9b30da0d32e99c239a51c3d868960fde  gpt_both5.bin
+d3d913561434b15f1fd42b5c26b6e514  gpt_main0.bin
+42d103f66ffadf2fabe079c864d6ad2f  gpt_main1.bin
+33f9210eb72379fa4d737f7d968d69fe  gpt_main2.bin
+41530c11400b67d4efaca893a7bbc99f  gpt_main3.bin
+2ac0679ed66a373fc2a863dcb17bf6bf  gpt_main4.bin
+866e4769d16b95bb473441fa79b39d23  gpt_main5.bin
 94794668fb0a63c599e754cba52f6517  hyp.mbn
 35cc47772102f785807556e03135764a  imagefv.elf
 1fbaef77827cc531b5b7372ad1ee4937  keymaster64.mbn
diff --git a/installer/db845c/dragonboard-845c-bootloader-ufs-aosp/abl.elf b/installer/db845c/dragonboard-845c-bootloader-ufs-aosp/abl.elf
index 4a5d7f9..a8e5195 100644
--- a/installer/db845c/dragonboard-845c-bootloader-ufs-aosp/abl.elf
+++ b/installer/db845c/dragonboard-845c-bootloader-ufs-aosp/abl.elf
Binary files differ
diff --git a/installer/db845c/dragonboard-845c-bootloader-ufs-aosp/devcfg.mbn b/installer/db845c/dragonboard-845c-bootloader-ufs-aosp/devcfg.mbn
index 3f8e6ef..f7080e7 100644
--- a/installer/db845c/dragonboard-845c-bootloader-ufs-aosp/devcfg.mbn
+++ b/installer/db845c/dragonboard-845c-bootloader-ufs-aosp/devcfg.mbn
Binary files differ
diff --git a/installer/db845c/dragonboard-845c-bootloader-ufs-aosp/gpt_backup0.bin b/installer/db845c/dragonboard-845c-bootloader-ufs-aosp/gpt_backup0.bin
index a8d31d7..c293d6c 100644
--- a/installer/db845c/dragonboard-845c-bootloader-ufs-aosp/gpt_backup0.bin
+++ b/installer/db845c/dragonboard-845c-bootloader-ufs-aosp/gpt_backup0.bin
Binary files differ
diff --git a/installer/db845c/dragonboard-845c-bootloader-ufs-aosp/gpt_backup1.bin b/installer/db845c/dragonboard-845c-bootloader-ufs-aosp/gpt_backup1.bin
index 91d90f0..a7df42f 100644
--- a/installer/db845c/dragonboard-845c-bootloader-ufs-aosp/gpt_backup1.bin
+++ b/installer/db845c/dragonboard-845c-bootloader-ufs-aosp/gpt_backup1.bin
Binary files differ
diff --git a/installer/db845c/dragonboard-845c-bootloader-ufs-aosp/gpt_backup2.bin b/installer/db845c/dragonboard-845c-bootloader-ufs-aosp/gpt_backup2.bin
index 629a1af..9768f0d 100644
--- a/installer/db845c/dragonboard-845c-bootloader-ufs-aosp/gpt_backup2.bin
+++ b/installer/db845c/dragonboard-845c-bootloader-ufs-aosp/gpt_backup2.bin
Binary files differ
diff --git a/installer/db845c/dragonboard-845c-bootloader-ufs-aosp/gpt_backup3.bin b/installer/db845c/dragonboard-845c-bootloader-ufs-aosp/gpt_backup3.bin
index 5c15335..308f3d7 100644
--- a/installer/db845c/dragonboard-845c-bootloader-ufs-aosp/gpt_backup3.bin
+++ b/installer/db845c/dragonboard-845c-bootloader-ufs-aosp/gpt_backup3.bin
Binary files differ
diff --git a/installer/db845c/dragonboard-845c-bootloader-ufs-aosp/gpt_backup4.bin b/installer/db845c/dragonboard-845c-bootloader-ufs-aosp/gpt_backup4.bin
index c8d1815..047e1b0 100644
--- a/installer/db845c/dragonboard-845c-bootloader-ufs-aosp/gpt_backup4.bin
+++ b/installer/db845c/dragonboard-845c-bootloader-ufs-aosp/gpt_backup4.bin
Binary files differ
diff --git a/installer/db845c/dragonboard-845c-bootloader-ufs-aosp/gpt_backup5.bin b/installer/db845c/dragonboard-845c-bootloader-ufs-aosp/gpt_backup5.bin
index 5138a0b..51e1a4c 100644
--- a/installer/db845c/dragonboard-845c-bootloader-ufs-aosp/gpt_backup5.bin
+++ b/installer/db845c/dragonboard-845c-bootloader-ufs-aosp/gpt_backup5.bin
Binary files differ
diff --git a/installer/db845c/dragonboard-845c-bootloader-ufs-aosp/gpt_both0.bin b/installer/db845c/dragonboard-845c-bootloader-ufs-aosp/gpt_both0.bin
index 23e88d7..ecb66bf 100644
--- a/installer/db845c/dragonboard-845c-bootloader-ufs-aosp/gpt_both0.bin
+++ b/installer/db845c/dragonboard-845c-bootloader-ufs-aosp/gpt_both0.bin
Binary files differ
diff --git a/installer/db845c/dragonboard-845c-bootloader-ufs-aosp/gpt_both1.bin b/installer/db845c/dragonboard-845c-bootloader-ufs-aosp/gpt_both1.bin
index 8148ecb..c16f0bd 100644
--- a/installer/db845c/dragonboard-845c-bootloader-ufs-aosp/gpt_both1.bin
+++ b/installer/db845c/dragonboard-845c-bootloader-ufs-aosp/gpt_both1.bin
Binary files differ
diff --git a/installer/db845c/dragonboard-845c-bootloader-ufs-aosp/gpt_both2.bin b/installer/db845c/dragonboard-845c-bootloader-ufs-aosp/gpt_both2.bin
index df1479e..bd359d5 100644
--- a/installer/db845c/dragonboard-845c-bootloader-ufs-aosp/gpt_both2.bin
+++ b/installer/db845c/dragonboard-845c-bootloader-ufs-aosp/gpt_both2.bin
Binary files differ
diff --git a/installer/db845c/dragonboard-845c-bootloader-ufs-aosp/gpt_both3.bin b/installer/db845c/dragonboard-845c-bootloader-ufs-aosp/gpt_both3.bin
index 4ae8942..ae4516f 100644
--- a/installer/db845c/dragonboard-845c-bootloader-ufs-aosp/gpt_both3.bin
+++ b/installer/db845c/dragonboard-845c-bootloader-ufs-aosp/gpt_both3.bin
Binary files differ
diff --git a/installer/db845c/dragonboard-845c-bootloader-ufs-aosp/gpt_both4.bin b/installer/db845c/dragonboard-845c-bootloader-ufs-aosp/gpt_both4.bin
index cad3b85..bc2cf44 100644
--- a/installer/db845c/dragonboard-845c-bootloader-ufs-aosp/gpt_both4.bin
+++ b/installer/db845c/dragonboard-845c-bootloader-ufs-aosp/gpt_both4.bin
Binary files differ
diff --git a/installer/db845c/dragonboard-845c-bootloader-ufs-aosp/gpt_both5.bin b/installer/db845c/dragonboard-845c-bootloader-ufs-aosp/gpt_both5.bin
index 3180a75..47be07d 100644
--- a/installer/db845c/dragonboard-845c-bootloader-ufs-aosp/gpt_both5.bin
+++ b/installer/db845c/dragonboard-845c-bootloader-ufs-aosp/gpt_both5.bin
Binary files differ
diff --git a/installer/db845c/dragonboard-845c-bootloader-ufs-aosp/gpt_main0.bin b/installer/db845c/dragonboard-845c-bootloader-ufs-aosp/gpt_main0.bin
index eddb102..9fffcb8 100644
--- a/installer/db845c/dragonboard-845c-bootloader-ufs-aosp/gpt_main0.bin
+++ b/installer/db845c/dragonboard-845c-bootloader-ufs-aosp/gpt_main0.bin
Binary files differ
diff --git a/installer/db845c/dragonboard-845c-bootloader-ufs-aosp/gpt_main1.bin b/installer/db845c/dragonboard-845c-bootloader-ufs-aosp/gpt_main1.bin
index 8a28543..33c7c99 100644
--- a/installer/db845c/dragonboard-845c-bootloader-ufs-aosp/gpt_main1.bin
+++ b/installer/db845c/dragonboard-845c-bootloader-ufs-aosp/gpt_main1.bin
Binary files differ
diff --git a/installer/db845c/dragonboard-845c-bootloader-ufs-aosp/gpt_main2.bin b/installer/db845c/dragonboard-845c-bootloader-ufs-aosp/gpt_main2.bin
index fad7645..ea6d98f 100644
--- a/installer/db845c/dragonboard-845c-bootloader-ufs-aosp/gpt_main2.bin
+++ b/installer/db845c/dragonboard-845c-bootloader-ufs-aosp/gpt_main2.bin
Binary files differ
diff --git a/installer/db845c/dragonboard-845c-bootloader-ufs-aosp/gpt_main3.bin b/installer/db845c/dragonboard-845c-bootloader-ufs-aosp/gpt_main3.bin
index ecd0efd..ed6134e 100644
--- a/installer/db845c/dragonboard-845c-bootloader-ufs-aosp/gpt_main3.bin
+++ b/installer/db845c/dragonboard-845c-bootloader-ufs-aosp/gpt_main3.bin
Binary files differ
diff --git a/installer/db845c/dragonboard-845c-bootloader-ufs-aosp/gpt_main4.bin b/installer/db845c/dragonboard-845c-bootloader-ufs-aosp/gpt_main4.bin
index ef68ad2..e690bd8 100644
--- a/installer/db845c/dragonboard-845c-bootloader-ufs-aosp/gpt_main4.bin
+++ b/installer/db845c/dragonboard-845c-bootloader-ufs-aosp/gpt_main4.bin
Binary files differ
diff --git a/installer/db845c/dragonboard-845c-bootloader-ufs-aosp/gpt_main5.bin b/installer/db845c/dragonboard-845c-bootloader-ufs-aosp/gpt_main5.bin
index 4aabafb..f7c071c 100644
--- a/installer/db845c/dragonboard-845c-bootloader-ufs-aosp/gpt_main5.bin
+++ b/installer/db845c/dragonboard-845c-bootloader-ufs-aosp/gpt_main5.bin
Binary files differ
diff --git a/installer/db845c/flash-all-aosp.sh b/installer/db845c/flash-all-aosp.sh
index 182278a..57391f8 100755
--- a/installer/db845c/flash-all-aosp.sh
+++ b/installer/db845c/flash-all-aosp.sh
@@ -42,17 +42,23 @@
 fastboot flash userdata "${ANDROID_PRODUCT_OUT}"/userdata.img
 
 if [ "$1" != "" ]; then
+    if [ "$2" = "" ]; then
+        echo "FLASH-ALL-AOSP: Trying to build boot.img? Pass corresponding dtb as well"
+        echo "                Usage: flash-all-aosp.sh Image.gz sdm845-db845c.dtb"
+        exit
+    fi
+
     ANDROID_BUILD_TOP=${INSTALLER_DIR}/../../../../../
     ANDROID_OUT_HOST_BIN="${ANDROID_BUILD_TOP}/out/host/linux-x86/bin"
 
     if [ ! -d "${ANDROID_OUT_HOST_BIN}" ]; then
         echo "FLASH-ALL-AOSP: error in locating out/host/ directory for mkbootimg, check if it exist"
-        echo "FLASH-ALL-AOSP: can't build boot image with user provided ${1} kernel image"
+        echo "FLASH-ALL-AOSP: can't build boot image with user provided kernel image and dtb"
         exit
     fi
 
-    echo "FLASH-ALL-AOSP: Building boot image with user provided ${1} kernel image"
-    ${ANDROID_OUT_HOST_BIN}/mkbootimg --kernel ${1} --ramdisk ${ANDROID_PRODUCT_OUT}/ramdisk.img --base 0x80000000 --pagesize 2048 --cmdline "firmware_class.path=/vendor/firmware/ androidboot.hardware=db845c init=/init androidboot.boot_devices=soc/1d84000.ufshc printk.devkmsg=on buildvariant=userdebug" --output ${ANDROID_PRODUCT_OUT}/boot.img
+    echo "FLASH-ALL-AOSP: Building boot image with user provided ${1} kernel image and ${2} dtb"
+    ${ANDROID_OUT_HOST_BIN}/mkbootimg --kernel ${1} --dtb ${2} --ramdisk ${ANDROID_PRODUCT_OUT}/ramdisk.img --header_version 2 --base 0x80000000 --pagesize 2048 --cmdline "firmware_class.path=/vendor/firmware/ androidboot.hardware=db845c init=/init androidboot.boot_devices=soc/1d84000.ufshc printk.devkmsg=on buildvariant=userdebug" --output ${ANDROID_PRODUCT_OUT}/boot.img
 
     echo "FLASH-ALL-AOSP: Flash boot image"
     fastboot flash boot ${ANDROID_PRODUCT_OUT}/boot.img
diff --git a/installer/db845c/recovery.sh b/installer/db845c/recovery.sh
old mode 100644
new mode 100755